resolve trade conflicts